From f9bdb2bca4301cfa589e08b7a86b069b20107d50 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 8 Dec 2005 02:07:45 +0000
Subject: [PATCH] * (bug 4214) Skip redundant action text inserts into the HTML
 <title>

---
 RELEASE-NOTES           |  1 +
 includes/OutputPage.php | 15 ++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1dad42f567..79c174adb9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -304,6 +304,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 4201) Fix user-talk mode for Enotif, and general code cleanup
 * (bug 4207) Wrong image size when using 100x200px syntax to scale image up
   patch by David Benbennick
+* (bug 4214) Skip redundant action text inserts into the HTML <title>
 
 
 === Caveats ===
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index bf5d17a8a4..56f0aa32ac 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -142,20 +142,17 @@ class OutputPage {
 		global $action;
 		switch($action) {
 			case 'edit':
-				return wfMsg('edit');
-			case 'history':
-				return wfMsg('history_short');
+			case 'delete':
 			case 'protect':
-				return wfMsg('protect');
 			case 'unprotect':
-				return wfMsg('unprotect');
-			case 'delete':
-				return wfMsg('delete');
 			case 'watch':
-				return wfMsg('watch');
 			case 'unwatch':
-				return wfMsg('unwatch');
+				// Display title is already customized
+				return '';
+			case 'history':
+				return wfMsg('history_short');
 			case 'submit':
+				// FIXME: bug 2735; not correct for special pages etc
 				return wfMsg('preview');
 			case 'info':
 				return wfMsg('info_short');
-- 
2.20.1